Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Dec 2011 20:38:17 +0000 (12:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Dec 2011 20:38:17 +0000 (12:38 -0800)

Trivial merge